sveltekit 2

11 files changed, 19 insertions, 19 deletions

diff --git a/src/routes/(app)/[username]/(profile)/event/[id]/+page.server.js b/src/routes/(app)/[username]/(profile)/event/[id]/+page.server.js
index ec4da865..24f2b611 100644
--- a/src/routes/(app)/[username]/(profile)/event/[id]/+page.server.js
+++ b/src/routes/(app)/[username]/(profile)/event/[id]/+page.server.js
@@ -4,9 +4,9 @@ import { error } from "@sveltejs/kit";
 export async function load({ params: { id } }) {
   try {
     let event = await get(`/event/${id}`);
-    if (!event) throw error(500, "Event not found");
+    if (!event) error(500, "Event not found");
     return { event };
   } catch (e) {
-    throw error(500, e.message);
+    error(500, e.message);
   }
 }
diff --git a/src/routes/(app)/[username]/(profile)/request/+page.server.js b/src/routes/(app)/[username]/(profile)/request/+page.server.js
index 754c5805..f22dcbb7 100644
--- a/src/routes/(app)/[username]/(profile)/request/+page.server.js
+++ b/src/routes/(app)/[username]/(profile)/request/+page.server.js
@@ -5,7 +5,7 @@ export const actions = {
   create: async ({ cookies, params, request, url }) => {
     let form = await fd(request);
     let { id, requester } = await post("/requests", form, auth(cookies));
-    throw redirect(307, `/${params.username}/request/${id}`);
+    redirect(307, `/${params.username}/request/${id}`);
   },
 
   delete: async ({ cookies, request }) => {
diff --git a/src/routes/(app)/[username]/+layout.server.js b/src/routes/(app)/[username]/+layout.server.js
index 3b25b3b5..11e6d45c 100644
--- a/src/routes/(app)/[username]/+layout.server.js
+++ b/src/routes/(app)/[username]/+layout.server.js
@@ -13,6 +13,6 @@ export let load = async ({ cookies, depends, params: { username } }) => {
 
     return { subject };
   } catch (e) {
-    throw error(500, "Unable to retrieve user account data");
+    error(500, "Unable to retrieve user account data");
   }
 };
diff --git a/src/routes/(app)/[username]/address/+page.server.js b/src/routes/(app)/[username]/address/+page.server.js
index 1a782f9d..f8e271f9 100644
--- a/src/routes/(app)/[username]/address/+page.server.js
+++ b/src/routes/(app)/[username]/address/+page.server.js
@@ -6,5 +6,5 @@ export async function load({ cookies, params, parent }) {
   let rates = await get("/rates");
   let invoice = { type: "bitcoin" };
   let { hash } = await post(`/invoice`, { invoice, user }, auth(cookies));
-  throw redirect(307, `/${user.username}/invoice/${hash}`);
+  redirect(307, `/${user.username}/invoice/${hash}`);
 }
diff --git a/src/routes/(app)/[username]/card/[serial]/+page.server.js b/src/routes/(app)/[username]/card/[serial]/+page.server.js
index 20b657a1..945eee30 100644
--- a/src/routes/(app)/[username]/card/[serial]/+page.server.js
+++ b/src/routes/(app)/[username]/card/[serial]/+page.server.js
@@ -10,7 +10,7 @@ export let load = async ({ cookies, params }) => {
     console.log(e);
   }
 
-  if (fund) throw redirect(307, `/fund/${serial}`);
+  if (fund) redirect(307, `/fund/${serial}`);
 
   return params;
 };
diff --git a/src/routes/(app)/[username]/generate/+server.js b/src/routes/(app)/[username]/generate/+server.js
index 1dca1ece..3e3a9358 100644
--- a/src/routes/(app)/[username]/generate/+server.js
+++ b/src/routes/(app)/[username]/generate/+server.js
@@ -6,6 +6,6 @@ export async function POST({ cookies, request }) {
     let body = await request.json();
     return json(await post(`/user`, body, auth(cookies)));
   } catch (e) {
-    throw error(500, e.message);
+    error(500, e.message);
   }
 }
diff --git a/src/routes/(app)/[username]/invoice/[id]/+layout.server.js b/src/routes/(app)/[username]/invoice/[id]/+layout.server.js
index b9d1c43d..b887d407 100644
--- a/src/routes/(app)/[username]/invoice/[id]/+layout.server.js
+++ b/src/routes/(app)/[username]/invoice/[id]/+layout.server.js
@@ -16,7 +16,7 @@ export async function load({ depends, params, url, parent }) {
     !url.pathname.includes("tip") &&
     !options
   ) {
-    throw redirect(307, `/send/invoice/${id}`);
+    redirect(307, `/send/invoice/${id}`);
   }
 
   let { amount, pending, received } = invoice;
@@ -26,11 +26,11 @@ export async function load({ depends, params, url, parent }) {
     (!amount && received) ||
     (amount > 0 && (pending >= amount || received >= amount));
   if (paid && !url.pathname.endsWith("paid")) {
-    throw redirect(
-      307,
-      `/${params.username}/invoice/${id}/paid` +
-        (options ? "?options=true" : "")
-    );
+    redirect(
+            307,
+            `/${params.username}/invoice/${id}/paid` +
+              (options ? "?options=true" : "")
+          );
   }
 
   let sm = Qr.drawImg(invoice.text || "", { size: 300 });
diff --git a/src/routes/(app)/[username]/invoice/[id]/tip/+page.server.js b/src/routes/(app)/[username]/invoice/[id]/tip/+page.server.js
index c9377e36..b81e2364 100644
--- a/src/routes/(app)/[username]/invoice/[id]/tip/+page.server.js
+++ b/src/routes/(app)/[username]/invoice/[id]/tip/+page.server.js
@@ -4,7 +4,7 @@ import { redirect } from "@sveltejs/kit";
 export async function load({ parent, params }) {
   let { invoice } = await parent();
   if (!invoice.amount)
-    throw redirect(307, `/${params.username}/invoice/${invoice.id}`);
+    redirect(307, `/${params.username}/invoice/${invoice.id}`);
 }
 
 export const actions = {
diff --git a/src/routes/(app)/[username]/request/[id]/+page.server.js b/src/routes/(app)/[username]/request/[id]/+page.server.js
index 09cce465..2712c7ca 100644
--- a/src/routes/(app)/[username]/request/[id]/+page.server.js
+++ b/src/routes/(app)/[username]/request/[id]/+page.server.js
@@ -5,7 +5,7 @@ export let load = async ({ cookies, depends, params, parent }) => {
   depends("app:invoice");
 
   let { user } = await parent();
-  if (!user) throw redirect(307, "/login");
+  if (!user) redirect(307, "/login");
 
   let { request } = await get(`/request/${params.id}`, auth(cookies));
   let { invoice } = request;
@@ -16,10 +16,10 @@ export let load = async ({ cookies, depends, params, parent }) => {
       request.recipient.username === user.username &&
       ((received && !amount) || received >= amount)
     )
-      throw redirect(307, `/${user.username}/invoice/${id}/paid`);
+      redirect(307, `/${user.username}/invoice/${id}/paid`);
 
     if (request.requester.username === user.username)
-      throw redirect(307, `/send/${id}`);
+      redirect(307, `/send/${id}`);
   }
 
   return { request };
diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.server.js b/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
index c035da12..b9717b82 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
@@ -3,7 +3,7 @@ import { fd, auth, get, post } from "$lib/utils";
 
 export function load({ cookies, params, url }) {
   if (url.pathname.endsWith("settings"))
-    throw redirect(307, url.pathname + "/account");
+    redirect(307, url.pathname + "/account");
   params.cookies = cookies.getAll();
   return params;
 }
diff --git a/src/routes/(app)/[username]/verify/[code]/+page.server.js b/src/routes/(app)/[username]/verify/[code]/+page.server.js
index 3ddcd412..19453d9d 100644
--- a/src/routes/(app)/[username]/verify/[code]/+page.server.js
+++ b/src/routes/(app)/[username]/verify/[code]/+page.server.js
@@ -10,5 +10,5 @@ export let load = async ({ params: { code } }) => {
     return { error: "Verification failed" };
   }
 
-  throw redirect(307, `/${user.username}/settings/account?verified=true`);
+  redirect(307, `/${user.username}/settings/account?verified=true`);
 };